From 4b163808685487ad6d4fc1ebcdfb78c5c0969291 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Tue, 4 May 1993 02:29:06 +0000 Subject: [PATCH] * emacs.c (SEPCHAR): Instead of defining this to be ',' on VMS and ':' elsewhere, just have it default to ':' if not #defined, and #define it to be ',' in s/vms.h; OS/2 will need it to be ';'. * s/vms.h (SEPCHAR): #define this to be ','. * s/template.h (SEPCHAR): Mention this. Changes for Emacs 19 from Thorsten Ohl : * s/mach2.h: copied from the Emacs 18.59 distribution. Don't define NO_REMAP, define START_FILES as `pre-crt0.o' instead. Define LIB_MATH as `-lm', to override the default `-lm -lc' (there is no libc on the NeXT). * ymakefile (STARTFILES): Allow config.h to set this value even if ORDINARY_LINK is defined. * unexnext.c: Fix subdirectories for the machine dependent include files for NeXTStep 3.0; #include and instead of and . (getsectbyname): Remove prototype for this; the system #include files take care of that. (malloc_cookie): New variable. (unexec_doit): Set malloc_cookie to the result returned by malloc_freezedry. * emacs.c (main): Declare malloc_cookie to be extern, so that we can get the value set when we dumped and pass it to malloc_jumpstart. * systime.h: The NeXT has a timezone function. --- src/emacs.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/emacs.c b/src/emacs.c index 8143498a104..6fed31c297c 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -237,7 +237,7 @@ main (argc, argv, envp) #endif #ifdef NeXT - static int malloc_cookie; + extern int malloc_cookie; /* This helps out unexnext.c. */ if (initialized) @@ -800,9 +800,7 @@ and announce itself normally when it is run.") #endif /* not CANNOT_DUMP */ -#ifdef VMS -#define SEPCHAR ',' -#else +#ifndef SEPCHAR #define SEPCHAR ':' #endif -- 2.30.2